Autogenerated HTML docs for v1.8.4-273-ga194
diff --git a/git-config.html b/git-config.html index 5c304c7..4d3d140 100644 --- a/git-config.html +++ b/git-config.html
@@ -2447,6 +2447,12 @@ "git pull" is run. See "pull.rebase" for doing this in a non branch-specific manner. </p> +<div class="literalblock"> +<div class="content"> +<pre><code>When preserve, also pass `--preserve-merges` along to 'git rebase' +so that locally committed merge commits will not be flattened +by running 'git pull'.</code></pre> +</div></div> <div class="paragraph"><p><strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a> for details).</p></div> @@ -5166,6 +5172,12 @@ pull" is run. See "branch.<name>.rebase" for setting this on a per-branch basis. </p> +<div class="literalblock"> +<div class="content"> +<pre><code>When preserve, also pass `--preserve-merges` along to 'git rebase' +so that locally committed merge commits will not be flattened +by running 'git pull'.</code></pre> +</div></div> <div class="paragraph"><p><strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a> for details).</p></div>
